Merge changes I49a33e91,I7f45d955 am: 71d0536932

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

Change-Id: Icb98ea429016f47a89ba96a26c0b5e9a850fe72c