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

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

Change-Id: I22a75b31abf5f0adfe2835f9da66344aa73a3a22
tree: 9d4d3d26ab28b100e054ea5edfb4fb053f8ed85d
  1. core/
  2. services/
  3. tests/