Merge changes If2201f39,Ia1c366c5 am: fd0e9821fb am: 95e7eba65a am: 8ff435aced

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

Change-Id: Ic2857aae38dfa7ccf9996689e198f9e175045462
tree: fb5b9da80c6df5794818509bb98de4be0c80f3aa
  1. core/
  2. services/
  3. tests/