Merge "Fix NPE in letterbox double tap" into udc-qpr-dev am: 9e22e96f

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



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