[automerger skipped] Merge Android R am: f733fa98d3 -s ours am: 9f00817f93 -s ours am: f4fe381229 -s ours am: 5ea074e311 -s ours

am skip reason: Change-Id Id97fbe726deb852052296030894ccad6d02de37b with SHA-1 506f871568 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/hardware/interfaces/+/1422367

Change-Id: Iad3cfb8a53aa42171a3027b7b2acacc4eb6c9768