Revert^2 "Fail adb install on external profile errors." am: 1dde3e7f75

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

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