Merge "Add sampling to FGS atom" into sc-dev am: 89f1f81ae0

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

Change-Id: I503bd31e58864fbb9aa0f63239dec79dec4ce9f6