Merge changes I1d1f0d2d,Ifbd4a978 am: 77ed87e072

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I156b9230ef2ea495a6d1661c3f618de4a9c2ac2a
tree: c4f1aebfb153f3467cbd78383bf66b80db8124fb
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS