am 25596374: Merge "[ActivityManager] Prevent provider from been created twice."

* commit '255963742982daf46eb665a2934bd61e7ed95c81':
  [ActivityManager] Prevent provider from been created twice.