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

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



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