[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 tm-dev am: 0e324fcf am: 488db306 am: 42001b18 am: 6818aa22 -s ours

am skip reason: subject contains skip directive

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



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