Merge changes I4753cae7,Ic6554d9b am: d752b7b746

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

Change-Id: I062b5d8c0ce9f2b15ed4c325bfe08dc624440767