Merge "Fix sdfps overlay disappear" into udc-dev am: dcd8a29b am: fd8473b9 am: bc8db56a

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



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