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