[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: 711fb576 am: fb7746a7 -s ours

am skip reason: subject contains skip directive

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



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