[automerger skipped] Validate the ServiceRecord state while handling...

[automerger skipped] Validate the ServiceRecord state while handling misbehaving FGS am: ae5a219b -s ours am: a388d253 -s ours

am skip reason: Merged-In If18e1d7ba88aef693349b82dc6e70f7d98c68665 with SHA-1 e9b09647 is already in history

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

Change-Id: I277821c60d3c017ecc07af2195e5b7f15a1d819c