Merge "Fix BEHAVIOR_SHOW_BARS_BY_TOUCH" into rvc-qpr-dev am: 484a11d3ec

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

Change-Id: Icba8e6f07164db973674172ffb45751733036643