am 6d856bfb: am cf7d2d95: Merge "[ActivityManager] Avoid orphan ContentProviderRecord."

* commit '6d856bfba5b6ae488d49c4909510cd87000cd922':
  [ActivityManager] Avoid orphan ContentProviderRecord.