Merge "Overlay manifest setting by package manager am: c39b0b23eb am: 0a40cb0bf5" into qt-r1-dev-plus-aosp