[automerger skipped] Merge Android R am: 1136876068
-s ours am: e8d98e4d14
-s ours am: 2c7b6e54c3
-s ours
am skip reason: Change-Id I33c8b79d82aaaecd05cc1c74f6c6a8613c42fa68 with SHA-1 f9d897c0ce
is in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1422435
Change-Id: I1cf1d9c821c764166cd807a90ead1345dbbe339c
This commit is contained in:
commit
10f108d342