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

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

Change-Id: Ifc8f52d25c8a15503caf88f956f0f1d71e73c170