Merge changes I17264f0e,I0581978f am: 06c8be69b9

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

Change-Id: I30faa68caf5a55504b1b8cc3c9b958c308a9b120