Merge changes I6a48d4db,I6741c41c,Ifec6bde5,Icd0717c5 am: c6cd3d4f7b

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

Change-Id: I5545dddcb5c8499ac9c53325cbafd424124429e1
tree: c598dea0ca08e5c0cd91f4411bba80b2e3ef0721
  1. core/
  2. services/
  3. tests/