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

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



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