Merge "Fix incorrect behavior of back button in kids mode" into tm-qpr-dev am: cdf3f3dc

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



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