Merge "[6/n] Camera Compat: Fix the toast gating condition." into tm-qpr-dev am: 934de388ec am: 21744338c0

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

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