Merge changes from topic "cherrypick-fold-aod-keyguard-visible-zt6i81p6jh" into tm-mainline-prod am: 8005700e

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

Change-Id: I3858214a822ce344cb3c6b7bf1c40321dfbd03e1