Merge "Add '-unstable' to solve ODR violation" into rvc-dev-plus-aosp am: 2555567c am: 7cab297d

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

Change-Id: I62b57444a5e9c6e2f971cdd57e1d5d4995352617