Merge changes I61dd789f,I57c73264 am: 48a1062811 am: fb9eb14070

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I807dddf4ee23771cbaa47cd9429a46e1d789841b