Merge "fuzz_service_test: test restore calling ID" am: b32659ce am:...

Merge "fuzz_service_test: test restore calling ID" am: b32659ce am: 0f43c4d0 am: b9ef1c57 am: 88311717 am: 93850164 am: eb7d75b2

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2645266



Change-Id: Ia862f4883b647c37cd53b16b4cc3b32b1f26466f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>