[automerger skipped] Merge "Add Settings.Secure.NAVIGATION_MODE_RESTORE" into...

[automerger skipped] Merge "Add Settings.Secure.NAVIGATION_MODE_RESTORE" into udc-qpr-dev am: 7e01e3c5 am: 96c62e95 -s ours

am skip reason: Merged-In I12b182184e1d381e14c7b290fd5f357026990c78 with SHA-1 918a5710 is already in history

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



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