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

Change-Id: Id6877ffbca093ba6cbb3506c61c5ddb75553b03f