Merge "OMS: 'cmd overlay lookup': support --user" am: 5267d0e0d6 am: d64094cf30

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie2961b4276f4f6cc4095a15b9159912ee5c571f4