Merge "Fix sdfps overlay disappear" into udc-dev am: dcd8a29b am: 7fa971fe...

Merge "Fix sdfps overlay disappear" into udc-dev am: dcd8a29b am: 7fa971fe am: 9b11da8f am: 75c097b8

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



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