Merge changes I49a33e91,I7f45d955 am: 71d0536932 am: 99b9ce593c am: 899c7623cf am: 360ff40cf4

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

Change-Id: I3bcb7c40e45369f61b2c6c068517a42eab63357a