Merge changes I6de585de,Id0f9b5a9 am: c681633836 am: e563c30208 am: beb9c4fe58 am: db33922c54 am: 606a55e65f

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

Change-Id: I8dc1846ffc47eb86824270d69ef067817ae02519