Merge "Expand comment about using a merge api base" am: 0cf86f5a44

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

Change-Id: I25e88ca6d342d3a7c11afe002780d1c26138ac63