tree e83e3b1de9df0953be324a08c9ebfc1920e0d762
parent 3be814cbff8d381e460ca1e38e070d117b6ed28f
parent 4beba29d08e1911ca2dd601d605a376be467486e
author Dmitry Dementyev <dementyev@google.com> 1605111786 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1605111786 +0000

[automerger skipped] Protect GrantCredentialsPermissionActivity against overlay. am: deddb784d0 am: 21e36702cd am: f312c9e864 am: 6717abba6e -s ours am: 953586c0e7 -s ours am: 558392e1ed -s ours am: 4beba29d08 -s ours

am skip reason: Change-Id I15dd22791fcc61ef02b06ad51d9e4409d11c0181 with SHA-1 f45dcfe1f5 is in history

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

Change-Id: Ibdd39864620f264bfc9c40cafa758f376c458915