[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: ee6c97ca -s ours

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

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

Change-Id: Id064259b0a5f1ab72cde46deecfa0ee5a1c2674e