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

Change-Id: Idc39100f3c9cde445996e421de4c10b0ba89ae8f