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

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

Change-Id: I1d17ce9ff6d4f2532c9f0bb11d23205408fbd425