Merge "Fix back gesture / keycode for the PlatLogoActivity" into udc-dev am: 77b716350e am: b5aa9032f2

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

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