Merge "Need to call resetFgsRestrictionLocked() before calling setFgsRestrictionLocked() again." into sc-dev am: d26ab5ef am: 066585c1 am: 118ffdba

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

Change-Id: I9946d87255c51a9a090993170df351a394364485