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

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



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