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

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

Change-Id: I3166339d7a05ad7626f7f471960fbb2522bbb44e