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

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

Change-Id: Id4d857c4384d5162d8821e4759e9370b7a75eaa1