Merge "Increase keyguardDrawnTimeout to reduce fold->AOD flickers" into tm-qpr-dev am: 3029b6ee68

Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/21938815

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