Merge "Fix back gesture / keycode for the PlatLogoActivity" into udc-qpr-dev am: bb3104a83b am: 47f2c221f8

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

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