Merge changes I49a33e91,I7f45d955 am: 71d0536932 am: 99b9ce593c

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

Change-Id: Ib0f73ba1cfae8f3d8b7287892c2bf8a44f495fec