Merge commit 'a8cc20e5fb3d3f34dc2ab1c3f31d348b19afa87b' into gingerbread-plus-aosp * commit 'a8cc20e5fb3d3f34dc2ab1c3f31d348b19afa87b': b/3004029 Fixed content resolver loss
Merge commit 'a8cc20e5fb3d3f34dc2ab1c3f31d348b19afa87b' into gingerbread-plus-aosp * commit 'a8cc20e5fb3d3f34dc2ab1c3f31d348b19afa87b': b/3004029 Fixed content resolver loss