[automerger skipped] Validate the ServiceRecord state while handling misbehaving FGS am: ae5a219b95 -s ours am: a388d2533d -s ours
am skip reason: Merged-In If18e1d7ba88aef693349b82dc6e70f7d98c68665 with SHA-1 e9b096473f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14984596
Change-Id: Id9b22a7684088e06089bcd5275ed4c996eeec181
This commit is contained in: