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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2ea01b34a52fc86fe0ebd8b9abb9b1d3cea83acf