[automerger skipped] Merge changes from topic "am-54fac689a6aa4d21bf168f216f14d724" into rvc-dev-plus-aosp am: f25f734a -s ours
am skip reason: Change-Id Ibfa25c0fe7874ba08157a5ec43601c5cf8305723 with SHA-1 21f7e6a3 is in history
Change-Id: I1720859377555a3d6ff5ebb13131d3f462b8fa30