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

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

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