Merge "Support AOD => occluded and Dozing => occluded transitions" into udc-qpr-dev am: 0d77f1a443 am: 3cfe5985cb

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

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