Merge commit 'e3c59256794448c67e01333a9f5036559b1bd502' into am-58d0617b-47f2-44b7-ac1f-c278ee055d1e

* commit 'e3c59256794448c67e01333a9f5036559b1bd502':
  Use source bounds/activity options for App Info System Shortcut

Change-Id: Ic7e89e1f2de44198ab95308095b17447d27f0c0d