[automerger skipped] Merge changes from topic "am-4213fc2be07a475185b5b3813f7bfad1" into rvc-qpr-dev-plus-aosp am: 3b635347 -s ours
am skip reason: Change-Id I637dea3472354236d2fd1ef0a3306712b3283c29 with SHA-1 48d159fa is in history
Change-Id: I85b0f0065489d9b0a94156882361e7d0ecdf8cb6