[automerger skipped] Merge changes from topic "am-dc3ce6d99e174092972105b162ad41f3" into rvc-qpr-dev-plus-aosp am: d635cc66 -s ours
am skip reason: Change-Id I4c1d2a5c9f43650a5346a5ee0bb88eb36f850096 with SHA-1 eb618ef6 is in history
Change-Id: If6608c4d24d4d1cbf1b818c2eb9a0de54c641c70