Revert "Merge BroadcastOptions and ActivityOptions PendingIntent..."

Revert "CTS for PendingIntent BroadcastOptions BAL improvement"

Revert submission 15879527-component_options

Reason for revert: DroidMonitor: Potential culprit for Bug 203407624 - verifying through Forrest before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted
Reverted Changes:
I256115361:CTS for PendingIntent BroadcastOptions BAL improve...
Ic47b9fcd3:Merge BroadcastOptions and ActivityOptions Pending...

Change-Id: Iba7699b65a1ce29cf340ed06c495cc2b2b0d9b1c