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

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

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