[automerger skipped] Merge changes from topic "am-c836ea5454aa4ff5ab260f55a8924dc3" into rvc-d1-dev-plus-aosp am: 72f6905e -s ours
am skip reason: Change-Id I52ac80f15d8efe152dea81b75a82faa4da1b8600 with SHA-1 d5d442dd is in history
Change-Id: I2ae5535bac9c48b8d935057da86346ae51f7194f