[automerger skipped] Merge changes from topic "reconcile-sdk-data" am:...

[automerger skipped] Merge changes from topic "reconcile-sdk-data" am: 0b272119 am: 54aebb80 am: 016d7792 -s ours am: 4e937a33 -s ours am: 95c6dd42 -s ours

am skip reason: Merged-In Id672414b269f730a0181eafe67b8dbea0667c8e6 with SHA-1 a73327aa is already in history

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

Change-Id: Id286bcde529ad69789e8c1bbf38685227e042318