Merge "Fix DefaultSmsApplicationTest for organization-owned profile owner" into udc-dev am: f750196ca6 am: 3a9797a462
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21804619 Change-Id: Iec271a174bd6da3c9a5a2ce97216e4bdba559eb6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: