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

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

Change-Id: Ib7b483054ed05318eeee2bada0cb9535c5908d1f