Merge "Override registerReceiver methods in test Context to accept flags" am: 57ff4b4589 am: ebd19a22d8

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

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