Merge "Merge "Fix NPE in LegacyGlobalActions" into rvc-dev am: e3041c9a16 am: 61a85b962b" into rvc-d1-dev-plus-aosp am: f29f5fbd0c am: 11df9ac3e6
Change-Id: I621cdf1b058cf467ae3675386ede4e9011213222
This commit is contained in: