Merge changes I29bf2065,Ic858826c,I7fe0bd12 into tm-qpr-dev am: 2dcc550cb7

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

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