Merge "Make the condition of DISABLE_RECENT more robust in launch GCA CUJ" into udc-dev am: 3875579d am: 508b8b3a

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



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