Merge "Make everyone able to modify mock package" am: c3c6148928 am: 531ac1780d

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1c259607073cb89aa053fbeac3858907e00b5371