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

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



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