Merge changes I5ed1bc8b,Ie9e6af0e am: 834026197f am: 33fdb4a42a

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

Change-Id: Ia0f9ad67aaf675e8190d52e5814dbe855021a8b3