Merge changes I3711b362,I49421183,Icc0701cb,I2f5ccc1d am: 40b4ef6dd7

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

Change-Id: I021b2719e8b6d76cbb64d979f1ce5f661a1a25a5
tree: 90cf4ecf5a937a89d59b275d8e6955298054f45b
  1. core/
  2. services/
  3. tests/