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

Change-Id: I7d15e179a3d54429b4a8f28953a5d2e8a475f96d