Merge "nuplayer: ensure using video ts as anchor when really has no audio and...

Merge "nuplayer: ensure using video ts as anchor when really has no audio and clearAnchor must be followed by updateAnchor in video only case" am: ad28198c am: 9bca604e am: 5162739c am: 671e757d

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2363620



Change-Id: Idf371f534fd3f6ad1656a3f70310e1cd2961c43f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>