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

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

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



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