Merge "Revert "Adds assets, removes SFPS indicator, updates BP controller for...

Merge "Revert "Adds assets, removes SFPS indicator, updates BP controller for rear display/tent mode"" into tm-qpr-dev am: 019c9286 am: 7d58839e am: 14fb77d8 am: 5e7bbb44

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



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