Merge "Fix memory leak in MediaScannerConnection am: 439e5e49fb am: 6e02888c94" into nyc-mr1-dev-plus-aosp
am: f9ca28cada

Change-Id: I808a4045092bb90f018b4f92a105244053ee2bb4