Merge "Merge "Fix back gesture / keycode for the PlatLogoActivity" into udc-dev am: 77b71635 am: 78761adf am: 40ba3002" into udc-qpr-dev-plus-aosp am: d0d9d901

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24026633



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