Merge "UpsideDownCake is now 34" into udc-dev am: 1deeb7fabf am: fccccd57ef

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

Change-Id: I00976510e8f87946a2f290243bf694c6848270a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>