Merge "Use new GX overlay for new AOD/lockscreen transitions." into sc-dev am: 162e6767

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I156240468da70804e64c912c9e4b9fba011c7792