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

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

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