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

* commit '3846d3a4c5d79a9d7e86e43c64a5c21a29036de0':
  [ActivityManager] Avoid orphan ContentProviderRecord.