Merge changes I04ac8fba,Ia0a8548f am: db6628bb7d

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I97994a12e2fb41db137b299c4e73cf02a1827871