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
am: abf21ab2f4

Change-Id: I18b5f5f16d2313ab0cd55cf25e0d085d68c6bcdd