Merge "Prevent callback registration when back flag is disabled" into tm-dev am: 1c6de844

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



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