[automerger skipped] Merge changes from topic "vintf-manifest-error-logs-part-ii" into rvc-dev am: 5a1f5498 -s ours
am skip reason: Change-Id I0a26b875947878656d6eda03ffebce97ebb6139e with SHA-1 2edde8e6 is in history
Change-Id: Ia23585befcd677d31b35f72f86df4b359dc77bc8