Merge changes I6a6916fd,Ia7fdd0c8,Id2e73b83,If3e00d82,Ia7eb62d6 into tm-qpr-dev am: 18b730cbbb

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

Change-Id: Ibc5939778ee20fb4a67dd69c41abbd751f44a638
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>