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

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



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