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

[automerger skipped] Merge "Merge "Prevent callback registration when back flag is disabled" into tm-dev am: 1c6de844 am: 0592820f am: f238735a" into tm-qpr-dev-plus-aosp am: 65420482 -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: If78503e4f60f0dd071001bf534cbb8d6f88802e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>