Merge changes I3711b362,I49421183,Icc0701cb,I2f5ccc1d am: cbd6dbc553 am: f58d0c7de6

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

Change-Id: If8bab0ac75da87f417bc9bd925822a73002cecb7