Merge "Fix NPE from BackAnimationController#setBackToLauncherCallback." into tm-dev am: a671783048 am: 9f8e238be1 am: 1345cbb3f8 am: 5121ee29f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18785512 Change-Id: I46c9e4ec1ad028ecdba8e912666ed9b41dca82d3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: