Merge changes I915e0c4e,Iae187c0b am: c8387d8128

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I62cc28e59b358b6f996416f7dc6b80f620e7c18a