[automerger skipped] Merge changes from topic "lnh-platform-split" am: 47640f51 am: cb98f2f1 -s ours

am skip reason: Change-Id I7af128f42ae89a77a8e3fb113ea533331153c535 with SHA-1 864d3041 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348764

Change-Id: I3bb4fbb8c5c7df3f43bb69e1228848540e1249f9