Merge "Consolidate DISABLE_RECENT condition in adjustStatusBarLocked()" into udc-dev am: c0a8347c20 am: 6bee02e34d am: 4c8a5f053b

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

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