Merge "Consolidate DISABLE_RECENT condition in adjustStatusBarLocked()" into udc-dev am: c0a8347c20 am: b2d7a92d2c am: ad1847afbc

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

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