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: cd63ed37

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



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