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

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

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