Merge "Consolidate DISABLE_RECENT condition in adjustStatusBarLocked()" into udc-d1-dev am: a3a2612b am: 6e8a9145

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



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