Merge changes Iefd5b12b,I6907880a am: b888b08ffe

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

Change-Id: I850f44bba1efe2b2b0ed2a4eef2adeabf9b7223f