Merge changes Id75611af,I1ead6501 into tm-qpr-dev am: 8e315bb11d am: ee9fc9cb9c

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

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