[automerger skipped] Validate the ServiceRecord state while handling misbehaving FGS am: ae5a219b -s ours am: a388d253 -s ours am: 0c88a920 -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: I8cad1ecd917163325d5dc85d135b40db2a5deb8d