Merge "Revert "AOSP/Gallery2 - Updated to sdkVersion 29."" am: 2c4f42c34c am: e7a3cbbff3
am: 1f6eedef69

Change-Id: Iaf9b4b441addb7df58a0aed1d76fe5e21f979641