am 0756e4e4: Merge "Fix privilege escalation for preferred activities"

* commit '0756e4e42e36e649c858eca1f6c6c05d3422a8c8':
  Fix privilege escalation for preferred activities