Merge changes I6eb6d92b,I638e29fd,I2348b7a3 am: 0da448710c am: 3ff54c739f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6de299ec480f1a34042d2ef2ee86f00d030510e8
tree: 1afbef66a917bf891718ee255b9f4fbf9ae00a64
  1. core/
  2. services/
  3. tests/