Merge "Add the instructions to resolve ABI difference" am: 7487a0a121 am: d82440d841 am: 26793b8d64

Original change: https://android-review.googlesource.com/c/platform/development/+/2262922

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