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

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



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