Merge changes I6843e949,Ied9eea84,Id3ae744f into tm-qpr-dev am: 5d668fd0f6

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

Change-Id: Icdf709e0e6ab05759edba1ebfc7cb95df92ccce4
Signed-off-by: Automerger Merge Worker <[email protected]>