Merge "Merge tm-qpr-dev-plus-aosp-without-vendor@9467136" into stage-aosp-master am: ea9b4fcc53 am: 73c9d822e2

Original change: undetermined

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