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 am: b62b21ce am: fecba52e

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



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