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

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

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



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