[automerger skipped] Revert^2 "Fail adb install on external profile errors."...

[automerger skipped] Revert^2 "Fail adb install on external profile errors." am: 1dde3e7f am: b785772c am: af206077 am: 99b6b234 am: f51d9b51 -s ours

am skip reason: Merged-In I51f45cfa216b15f6c355bfba6ddc4ca620cdf0ae with SHA-1 e424064f is already in history

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



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