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

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

Change-Id: I67430cfc5820f6eeeaf978f913adf7393e0be151