Merge "Make ReconcileSdkData more flexible" am: 71f87cbb83

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

Change-Id: I9f27d2a50070935da1d62454a317e95587cd1d07