[automerger skipped] Merge "[DO NOT MERGE] Force extra nav bar provide side gesture insets" into sc-v2-dev am: c0bcb303e8 -s ours

am skip reason: subject contains skip directive

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

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