Merge "Consolidate DISABLE_RECENT condition in adjustStatusBarLocked()" into udc-dev am: c0a8347c

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



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