Merge "Update to use NAV_BAR_KIDS_MODE settings key for kids mode organizer"...

Merge "Update to use NAV_BAR_KIDS_MODE settings key for kids mode organizer" into tm-dev am: 8b8de88b

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



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