Merge changes I915e0c4e,Iae187c0b am: c8387d8128 am: 551f4c523a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I32b7147de91fa5878dbba5e95bf897912136cedf