[automerger skipped] Merge "Make ReconcileSdkData more flexible" am: 71f87cbb am: e4e804fe am: 16f62b2c -s ours am: 98c36935 -s ours

am skip reason: Merged-In Ie9cdc2c41bcec64028008a79654f2d38c017b6d1 with SHA-1 5288b055 is already in history

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

Change-Id: If7b46774d4972be447da10deb757348a8fadfec6