Merge "Revert "Use new GX overlay for new AOD/lockscreen transitions."" into sc-dev am: 8443a371

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7d9615723765c0d51cfb6de2608c57cca9d31f9d