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: fbd5dced am: 72db7c3b

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



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