Merge "SourceStampVerification Return more specific error code when...

Merge "SourceStampVerification Return more specific error code when verification fails" am: 03724475 am: 0c5d49cd am: e0874198 am: bef81fb8 am: 2be575d7 am: f59cb1b8

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



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