Merge "lshal: resistent to metaversion updates." am: 3f21eafad7 am: e3ce34306e am: 669dcbb01b

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1461294

Change-Id: I41a3ed6cbdec7557ccc294c749999296dad9d8fc