Android 10.0.0 release 35
Merge "composer: return pending config changes" into qt-r1-dev
am: 27b5ed1da4

Change-Id: Ic57c35a3267b2eedcb8851923db594b7a1d0d498