Merge "Hack: Clear the mDozeAmount=1 override when switching to SHADE to fix notifications going invisible" into tm-qpr-dev am: 34e978c30c am: 5c930c152d

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

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