Merge changes from topic "lnh-platform-split" am: c6b2c39d04
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348764 Change-Id: Ie34095ddf885fcf57e2a7bcb89817485564e9100
This commit is contained in: