Merge changes from topic "dumpsys-platform_compat" into qt-dev-plus-aosp am: 6d5fa6718c
am: b5f39a09f1

Change-Id: I84214a317e377f5f7d74f37b7e29ed09618d2d61