Merge changes I6de585de,Id0f9b5a9 am: c681633836 am: e563c30208

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

Change-Id: I328035ef7ef359993219baa263529960b38b5560