Merge changes I3826b9ef,I91d68ca3 am: 06c6ff8bf0 am: 97517b84c2

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

Change-Id: Ia10fe44c45f5dbaea808025210b7a287209b85dc