[automerger skipped] Merge changes from topic "am-243b5f64202e43c58dbe754c806d5af4" into rvc-d1-dev-plus-aosp am: 89222264 -s ours am: 9d34b8a6 -s ours

am skip reason: Change-Id I4fdff4d13b85a45642774befed16e4948433d35b with SHA-1 66876ec6 is in history

Change-Id: I2619aaa7a078b7a7ae2bac17f0a982ec430af566