Merge tag 'android-10.0.0_r31' of https://android.googlesource.com/platform/packages/apps/Traceur into HEAD

Android 10.0.0 release 31

Change-Id: Idc18aae451cdc4a80b5911112172357e75a956f1