Merge changes I6de585de,Id0f9b5a9 am: c681633836

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

Change-Id: Id1f8c73f4e8e54c1056d988716cc58a914a259d3