Merge "Support an x-coordinate for fps location" into sc-v2-dev am: 710a025d

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

Change-Id: Id6896f663a01455882982b73f289ff9c09b761b7