Merge "fuzz_service_test: test restore calling ID" am: b32659ce7b am: 0f43c4d0cd am: b9ef1c57a1

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

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