Merge "Add plumbing to show/hide side-fps UI affordance near power button" into sc-dev am: 96174915 am: d6c5d308

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

Change-Id: Ib70e653f12d2cdd44f43d171a1b0762e311d893b