[automerger skipped] Merge "Allow self blames to be trusted" into rvc-qpr-dev...

[automerger skipped] Merge "Allow self blames to be trusted" into rvc-qpr-dev am: 35c4f102 am: 5a953a9d -s ours

am skip reason: Change-Id I6f413dd6430f096590dadf87dad32264523b13c3 with SHA-1 4d4d8e2f is in history

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

Change-Id: I75f77df2848dcc60dbf0024cb9c36129d330a4c2