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