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

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

Change-Id: I688d3d23734c9af40502cf3f9e528c7541c0255d