[automerger skipped] Merge changes from topic "dumpsys-platform_compat" into qt-dev-plus-aosp am: 6d5fa6718c am: b5f39a09f1
am: f650d742a2 -s ours
am skip reason: change_id Ic429731a3364dab5902caeb12f48fecf2e49bb65 with SHA1 575d8f5a77 is in history

Change-Id: Ibdbc1c51c7e2046b463667ebf846a6d2ce59c27a