Merge "Fix back gesture not enabled in 3-button mode on fresh boot" into...

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

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



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