Merge changes Ic5a3e169,I76daa3ab am: fac6ce5e4d

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

Change-Id: Ibc9ad6c89e1214302b92118a01a924fa1481767e
tree: 2c0a087ba24fa34024911789e4f8f4f8e21aacc4
  1. core/
  2. services/
  3. tests/