Merge changes from topic "libmonet-qpr" into udc-qpr-dev am: ab956db7 am: ffecbe9d

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



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