[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: 74a6a813 am: 551d1fd5 am: f54e8b3c -s ours

am skip reason: subject contains skip directive

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



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