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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I01d0774f15b1df263aef631aa06db41bf1feb6dd