Merge "AOSP/Gallery2 - Updated to sdkVersion 29. Deleted usage of GROUP BY from the WHERE clause. Changed all COUNT(*) to COUNT(_id)."
am: 14731aa50d

Change-Id: I56afef95b78877fbdf9e44d680edc7aa0f18c740