Merge changes from topic "lnh-platform-split" am: 8af442d45e

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

Change-Id: Ie34095ddf885fcf57e2a7bcb89817485564e9100
tree: 8c4406eb3649ef403faa6496892864eec6fcda9d
  1. core/
  2. services/
  3. tests/