Merge changes I72119772,I124e4cc0,I462d4dfc into pi-dev

* changes:
  Clear all options from Task when any ActivityRecord consumes the options.
  Revert "Set options on startingActivity instead of topActivity"
  Revert "Set options for activity being brought to front."

diff --cc services/core/java/com/android/server/am/ActivityRecord.java
Simple merge

diff --cc services/core/java/com/android/server/am/ActivityStack.java
Simple merge

diff --cc services/core/java/com/android/server/am/ActivityStackSupervisor.java
Simple merge