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

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

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