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

Revert^2 "Fail adb install on external profile errors." am: 1dde3e7f am: b785772c am: af206077 am: 99b6b234

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



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