Merge changes I90bf7957,If58524b0 am: 7a2f9c06ca am: 3042783816

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

Change-Id: I13d23ef04c694527a4440f6bed21699684ec7424