Merge changes I17264f0e,I0581978f am: 06c8be69b9 am: d9a6df3947

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

Change-Id: I31535966123faa6e06c1c8b10178a880242d9f27