Merge "Fix back gesture / keycode for the PlatLogoActivity" into udc-dev am: 77b71635 am: 78761adf am: 56920576

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



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