Merge changes I0eb0362e,Iec9b579d am: 6c0e8ad627

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib155ee03b68d11fb84524cfbd005d9e8a545d777