[automerger skipped] Merge "Prevent callback registration when back flag is...

[automerger skipped] Merge "Prevent callback registration when back flag is disabled" into tm-dev am: 1c6de844 am: b38e19fd -s ours

am skip reason: Merged-In I54d843f11130a78ed5a68cbe4722e601a2086ee1 with SHA-1 a2e45f1e is already in history

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



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