Merge "Consolidate DISABLE_RECENT condition in adjustStatusBarLocked()" into...

Merge "Consolidate DISABLE_RECENT condition in adjustStatusBarLocked()" into udc-dev am: c0a8347c am: b2d7a92d am: d374b90c am: 148503a7

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



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