[automerger skipped] Merge changes from topic "am-62cf96e558d742ccab9d58387a2cabd1" into rvc-d1-dev-plus-aosp am: 4d977980 -s ours
am skip reason: Change-Id I2431a6d273d0d73432919baf41b4f66397f4b7dc with SHA-1 e277c77f is in history
Change-Id: Ie523c6f7c460826ae336f418edf1f2af77c041ca