Merge changes from topic "reconcile-sdk-data" am: 0b272119f0 am: 54aebb8045

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

Change-Id: I4c50f5b9c4260427654d4ea3e35decafea8b30f7