[automerger skipped] Merge changes from topic "am-1903a7d9341c4b0caf3590365040c16b" into rvc-qpr-dev-plus-aosp am: 3f3ba240 -s ours
am skip reason: Change-Id I86cb5af059fe81fe9f10555d57096164665205db with SHA-1 c9313a26 is in history
Change-Id: I4c1464dc1cf7e47d15a0e65c657e7c9229b5a9c2