Merge changes Id3a155a2,Ifbb9dfe3 into tm-qpr-dev am: 35ee3e1ba5

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

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