Merge changes Ibed6cdd4,I51e3c00d,Ibf37f94b am: 6e4b94388a am: d7bc7d7e29

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

Change-Id: Ie8d1a80486061a6ba2ca6a5f58c0e92201b8da6f
tree: 08dd65ff6ab73ab5b44bc061f66757d437c4f375
  1. core/
  2. services/
  3. tests/