Merge "Clear pending activity options when retrieved in ActivityManagerService." into oc-mr1-dev am: 7e0e6e90 am: af63ced7 Change-Id: Ied784c5b0b20aca02780f6b6bb8d221d367cf279