Merge "Merge "Fix NPE in findFrameMetricsObserver" into qt-dev am: 1d40ffcabf" into qt-dev-plus-aosp