Merge "Expose BroadcastOptions#setMaxManifestReceiverApiLevel as system API" am: c5ec644861 am: cb9a7b819c

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

Change-Id: Ifba72e9bd6cb8551d825898e2ffc8ad34bf238b3