Merge "Make ReconcileSdkData more flexible" am: 71f87cbb83 am: e4e804fedd

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2031828

Change-Id: I84024fcb4f308682f7b9bad4465c7377376ec11c