Merge "Add disconnect message constant Bug: b/171255813 Test: make Change-Id: Ia300b12ecf7d0c1d7d057b48a801b2928354315e" into rvc-qpr-dev am: 265a962d72 am: f6bdb84e9a

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

Change-Id: I55595d8ed84af37d315947809d95191b211f6164