[automerger skipped] Merge Android R am: f733fa98d3 -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: I354437ee2f05ecf3165b627e7e53fcfa61c606f7