Merge "(Partially) added myself to general mockingservicestests OWNERS." am: e97ad39eb7 am: 36d7324524

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

Change-Id: I397e510892b93c4afacd9ef68c17bbfc65e774e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>