Merge changes I72976905,I7a637d39 am: da498a524d am: f6aaaaddda

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

Change-Id: I99fa2e24bd6bbce859316e6e136887933a9218cf