[automerger skipped] Merge changes from topic "vintf-manifest-error-logs-part-ii" into rvc-dev am: 5a1f5498 am: 6fff543a -s ours am: c964f49c -s ours

am skip reason: Change-Id I0a26b875947878656d6eda03ffebce97ebb6139e with SHA-1 2edde8e6 is in history

Change-Id: I2510a684ec276f998e46c15422a64669db74794e