Merge changes Id9a9451a,Idf113709 am: 03a24f50cc

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

Change-Id: Ie027778a90deb5a3956f0e1dc9cbf462c9a4b50e