[automerger skipped] Merge "[DO NOT MERGE] Force extra nav bar provide side...

[automerger skipped] Merge "[DO NOT MERGE] Force extra nav bar provide side gesture insets" into sc-v2-dev am: c0bcb303 -s ours am: 9f46a6ec -s ours am: b15b4d56 -s ours am: 35088ed3 -s ours

am skip reason: subject contains skip directive

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



Change-Id: I179d632d143364f30beda08154544bc71a4c375c
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>