Merge "Fix back gesture not enabled in 3-button mode on fresh boot" into udc-qpr-dev am: 72ed444d

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



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