Merge changes from topic "topic_for_cp_sensorservice" into tm-qpr-dev am:...

Merge changes from topic "topic_for_cp_sensorservice" into tm-qpr-dev am: 57313125 am: e02e5819 am: ed159247

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



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