Merge "Fix mistake in disting of api txt" am: 89ee3e63 am: fc4d75a1 am:...

Merge "Fix mistake in disting of api txt" am: 89ee3e63 am: fc4d75a1 am: 26554faa am: dc3afbe3 am: e56c4bd7

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2059568



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